merge with xen-unstable.hg
authorAlex Williamson <alex.williamson@hp.com>
Thu, 7 Feb 2008 18:08:49 +0000 (11:08 -0700)
committerAlex Williamson <alex.williamson@hp.com>
Thu, 7 Feb 2008 18:08:49 +0000 (11:08 -0700)
commit50cdc10d699e5179bf8f1e9b086508f3ef3bf168
treea065b0f51dfc59811b870ff03d9455d10491d6c6
parent97ce7529f79e9c090ca7986b222758b81fe699cb
parent46bb4b6f02515c2ded81040c2eeb53d80047749e
merge with xen-unstable.hg